Simplify preempt.h dependencies by moving in_atomic() to preempt.c

..clean up the ensuing fallout.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c
index 2457fb407ea4583eae63233b285b28781b1025dd..454619a16978933dadedc49ef52a081bd62573c0 100644 (file)
--- a/xen/arch/x86/hvm/vmsi.c
+++ b/xen/arch/x86/hvm/vmsi.c
@@ -32,6 +32,7 @@
 #include <xen/lib.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
+#include <xen/irq.h>
 #include <public/hvm/ioreq.h>
 #include <asm/hvm/io.h>
 #include <asm/hvm/vpic.h>

diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c
index 1fd81dd2142e35dae26e660c8a780cd7dddcd938..5eb0e65c53a6074c46f42592fff159cd5db295d1 100644 (file)
--- a/xen/arch/x86/hvm/vmx/realmode.c
+++ b/xen/arch/x86/hvm/vmx/realmode.c
@@ -14,6 +14,7 @@
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/paging.h>
+#include <xen/softirq.h>
 #include <asm/event.h>
 #include <asm/hvm/emulate.h>
 #include <asm/hvm/hvm.h>

diff --git a/xen/common/domain.c b/xen/common/domain.c
index dc5a8768717daf689625c06160ae73e1012db9e6..5323c83bae6b494b77c13c2236d67e56c702b1ec 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -30,6 +30,7 @@
 #include <xen/wait.h>
 #include <xen/grant_table.h>
 #include <xen/xenoprof.h>
+#include <xen/irq.h>
 #include <acpi/cpufreq/cpufreq.h>
 #include <asm/debugger.h>
 #include <public/sched.h>

diff --git a/xen/common/preempt.c b/xen/common/preempt.c
index e2133ea50a9d194a190f0b3363d2cb675188f19e..a02eb6d28d060e420ad413c897383c38f10063fa 100644 (file)
--- a/xen/common/preempt.c
+++ b/xen/common/preempt.c
@@ -21,5 +21,12 @@
  */
 
 #include <xen/preempt.h>
+#include <xen/irq.h>
+#include <asm/system.h>
 
 DEFINE_PER_CPU(unsigned int, __preempt_count);
+
+bool_t in_atomic(void)
+{
+    return preempt_count() || in_irq() || !local_irq_is_enabled();
+}

diff --git a/xen/common/radix-tree.c b/xen/common/radix-tree.c
index 6f2d8b68cd9faaf4fb6886f5b12a983fa97f2b22..17361c7ffa01f6e177414cb3ea7575bf40749458 100644 (file)
--- a/xen/common/radix-tree.c
+++ b/xen/common/radix-tree.c
@@ -22,6 +22,7 @@
 #include <xen/config.h>
 #include <xen/init.h>
 #include <xen/radix-tree.h>
+#include <xen/errno.h>
 
 struct radix_tree_path {
        struct radix_tree_node *node;

diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index 2633ee2a142323ab3d8748ef185a56351ef6b31d..16d934e45aa913eeb85520780659799ff9193468 100644 (file)
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -22,6 +22,7 @@
 #include <xen/errno.h>
 #include <xen/pci.h>
 #include <xen/pci_regs.h>
+#include <xen/irq.h>
 #include <asm/amd-iommu.h>
 #include <asm/msi.h>
 #include <asm/hvm/svm/amd-iommu-proto.h>

diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
index ad08833d48b93349d2c2cac7cbcdc3393302b47f..c39a279cef27725cb533a6f2fce78994dac2efa0 100644 (file)
--- a/xen/drivers/passthrough/io.c
+++ b/xen/drivers/passthrough/io.c
@@ -20,6 +20,7 @@
 
 #include <xen/event.h>
 #include <xen/iommu.h>
+#include <xen/irq.h>
 #include <asm/hvm/irq.h>
 #include <asm/hvm/iommu.h>
 #include <asm/hvm/support.h>

diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index d3f5e8fda88bdb2931cc29a969eb4fce0ad8fa76..ec253a611ad13fa24a14c8f2634ca8245e126311 100644 (file)
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -21,6 +21,7 @@
 #include <xen/list.h>
 #include <xen/prefetch.h>
 #include <xen/iommu.h>
+#include <xen/irq.h>
 #include <asm/hvm/iommu.h>
 #include <asm/hvm/irq.h>
 #include <xen/delay.h>

diff --git a/xen/drivers/passthrough/vtd/x86/vtd.c b/xen/drivers/passthrough/vtd/x86/vtd.c
index 50d0f7d35886a701ca9898b497da6f1824780c87..1fe76a383ddf77a8886d51d9338bf0d03fce5e47 100644 (file)
--- a/xen/drivers/passthrough/vtd/x86/vtd.c
+++ b/xen/drivers/passthrough/vtd/x86/vtd.c
@@ -23,6 +23,7 @@
 #include <xen/domain_page.h>
 #include <asm/paging.h>
 #include <xen/iommu.h>
+#include <xen/irq.h>
 #include <xen/numa.h>
 #include <asm/fixmap.h>
 #include <asm/setup.h>

diff --git a/xen/include/xen/preempt.h b/xen/include/xen/preempt.h
index 749bc589cbbac80dec556665993827f99bcb033c..f4228058e524cb273032635a1588c52cd08f0244 100644 (file)
--- a/xen/include/xen/preempt.h
+++ b/xen/include/xen/preempt.h
@@ -10,9 +10,8 @@
 #define __XEN_PREEMPT_H__
 
 #include <xen/config.h>
+#include <xen/types.h>
 #include <xen/percpu.h>
-#include <xen/irq.h>    /* in_irq() */
-#include <asm/system.h> /* local_irq_is_enabled() */
 
 DECLARE_PER_CPU(unsigned int, __preempt_count);
 
@@ -28,6 +27,6 @@ DECLARE_PER_CPU(unsigned int, __preempt_count);
     preempt_count()--;                          \
 } while (0)
 
-#define in_atomic() (preempt_count() || in_irq() || !local_irq_is_enabled())
+bool_t in_atomic(void);
 
 #endif /* __XEN_PREEMPT_H__ */